Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 11 Feb 2011 01:32:13 +0000 (17:32 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 11 Feb 2011 01:32:13 +0000 (17:32 -0800)
commit26d0f968d95fee90911d269241c7ae16f39e6e1e
tree5cc58117ff1ef223c6b3e8a5150a31f75b902e1b
parentbc8a68d3ce4d7b06931d63f5f64c75420d3f8cab
parent7f7742b87b48a3d29a11f268dd4cb1e16dc169c7
Merge from mainline.